x11: Move initialization code

Move it from GdkDisplayManagerX11.init to GdkDisplay.class_init.

This shouldn't cause any problems, but who knows, so keep this patch
small.

Reason for this is the unification of display managers.

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 9ca1bd7ab2edc40e9c330a2c20c93b815808199f..f3541323f4215a0323561b5c4f9bc2abaabd1d0d 100644 (file)
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2824,4 +2824,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->convert_selection = _gdk_x11_display_convert_selection;
   display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list;
   display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
+
+  _gdk_x11_windowing_init ();
 }

diff --git a/gdk/x11/gdkdisplaymanager-x11.c b/gdk/x11/gdkdisplaymanager-x11.c
index 5393cadc544dd86ed8b353047d3fae91cd2d83c2..1be6a512a96cb1a0edcb5d902e31687e27eac1ff 100644 (file)
--- a/gdk/x11/gdkdisplaymanager-x11.c
+++ b/gdk/x11/gdkdisplaymanager-x11.c
@@ -75,7 +75,6 @@ g_initable_iface_init (GInitableIface *iface)
 static void
 gdk_x11_display_manager_init (GdkX11DisplayManager *manager)
 {
-  _gdk_x11_windowing_init ();
 }
 
 static void